core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ambiguous methods.

This commit is contained in:
md_5 2013-03-14 16:32:15 +11:00
parent cd442c75db
commit e2cf0f7076
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CraftBukkit-Patches/0039-Snapshot-support.patch
View File

@ -1,4 +1,4 @@
From 9cd3c96727e5250750fb7bfc6ab5e241874df301 Mon Sep 17 00:00:00 2001 From c5a08dfd520da58484fe0f953faa85a4c6f8d545 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 2 Mar 2013 13:34:17 +1100 Date: Sat, 2 Mar 2013 13:34:17 +1100
Subject: [PATCH] Snapshot support. Subject: [PATCH] Snapshot support.
@ -15,7 +15,7 @@ Subject: [PATCH] Snapshot support.
create mode 100644 src/main/java/net/minecraft/server/Packet100OpenWindow.java create mode 100644 src/main/java/net/minecraft/server/Packet100OpenWindow.java
diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
index 9ecefea..09ee088 100644 index 9ecefea..82df589 100644
--- a/src/main/java/net/minecraft/server/Container.java --- a/src/main/java/net/minecraft/server/Container.java
+++ b/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java
@@ -2,6 +2,7 @@ package net.minecraft.server; @@ -2,6 +2,7 @@ package net.minecraft.server;
@ -67,18 +67,18 @@ index 9ecefea..09ee088 100644
+ if (k == 5) { + if (k == 5) {
+ int i1 = this.g; + int i1 = this.g;
+ +
+ this.g = c(j); + this.g = c__(j);
+ if ((i1 != 1 || this.g != 2) && i1 != this.g) { + if ((i1 != 1 || this.g != 2) && i1 != this.g) {
+ this.d(); + this.d__();
+ } else if (playerinventory.getCarried() == null) { + } else if (playerinventory.getCarried() == null) {
+ this.d(); + this.d__();
+ } else if (this.g == 0) { + } else if (this.g == 0) {
+ this.f = b(j); + this.f = b__(j);
+ if (d(this.f)) { + if (d(this.f)) {
+ this.g = 1; + this.g = 1;
+ this.h.clear(); + this.h.clear();
+ } else { + } else {
+ this.d(); + this.d__();
+ } + }
+ } else if (this.g == 1) { + } else if (this.g == 1) {
+ Slot slot = (Slot) this.c.get(i); + Slot slot = (Slot) this.c.get(i);
@ -159,12 +159,12 @@ index 9ecefea..09ee088 100644
- slot.set(itemstack3.a(l)); - slot.set(itemstack3.a(l));
- } - }
- // CraftBukkit end - // CraftBukkit end
+ this.d(); + this.d__();
+ } else { + } else {
+ this.d(); + this.d__();
+ } + }
+ } else if (this.g != 0) { + } else if (this.g != 0) {
+ this.d(); + this.d__();
+ } else { + } else {
+ Slot slot2; + Slot slot2;
+ int k1; + int k1;
@ -450,11 +450,11 @@ index 9ecefea..09ee088 100644
return flag1; return flag1;
} }
+ +
+ public static int b(int i) { + public static int b__(int i) {
+ return i >> 2 & 3; + return i >> 2 & 3;
+ } + }
+ +
+ public static int c(int i) { + public static int c__(int i) {
+ return i & 3; + return i & 3;
+ } + }
+ +
@ -462,7 +462,7 @@ index 9ecefea..09ee088 100644
+ return i == 0 || i == 1; + return i == 0 || i == 1;
+ } + }
+ +
+ protected void d() { + protected void d__() {
+ this.g = 0; + this.g = 0;
+ this.h.clear(); + this.h.clear();
+ } + }