mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 00:47:38 +01:00
Rename ambiguous methods.
This commit is contained in:
parent
cd442c75db
commit
e2cf0f7076
@ -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>
|
||||
Date: Sat, 2 Mar 2013 13:34:17 +1100
|
||||
Subject: [PATCH] Snapshot support.
|
||||
@ -15,7 +15,7 @@ Subject: [PATCH] Snapshot support.
|
||||
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
|
||||
index 9ecefea..09ee088 100644
|
||||
index 9ecefea..82df589 100644
|
||||
--- a/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;
|
||||
@ -67,18 +67,18 @@ index 9ecefea..09ee088 100644
|
||||
+ if (k == 5) {
|
||||
+ int i1 = this.g;
|
||||
+
|
||||
+ this.g = c(j);
|
||||
+ this.g = c__(j);
|
||||
+ if ((i1 != 1 || this.g != 2) && i1 != this.g) {
|
||||
+ this.d();
|
||||
+ this.d__();
|
||||
+ } else if (playerinventory.getCarried() == null) {
|
||||
+ this.d();
|
||||
+ this.d__();
|
||||
+ } else if (this.g == 0) {
|
||||
+ this.f = b(j);
|
||||
+ this.f = b__(j);
|
||||
+ if (d(this.f)) {
|
||||
+ this.g = 1;
|
||||
+ this.h.clear();
|
||||
+ } else {
|
||||
+ this.d();
|
||||
+ this.d__();
|
||||
+ }
|
||||
+ } else if (this.g == 1) {
|
||||
+ Slot slot = (Slot) this.c.get(i);
|
||||
@ -159,12 +159,12 @@ index 9ecefea..09ee088 100644
|
||||
- slot.set(itemstack3.a(l));
|
||||
- }
|
||||
- // CraftBukkit end
|
||||
+ this.d();
|
||||
+ this.d__();
|
||||
+ } else {
|
||||
+ this.d();
|
||||
+ this.d__();
|
||||
+ }
|
||||
+ } else if (this.g != 0) {
|
||||
+ this.d();
|
||||
+ this.d__();
|
||||
+ } else {
|
||||
+ Slot slot2;
|
||||
+ int k1;
|
||||
@ -450,11 +450,11 @@ index 9ecefea..09ee088 100644
|
||||
return flag1;
|
||||
}
|
||||
+
|
||||
+ public static int b(int i) {
|
||||
+ public static int b__(int i) {
|
||||
+ return i >> 2 & 3;
|
||||
+ }
|
||||
+
|
||||
+ public static int c(int i) {
|
||||
+ public static int c__(int i) {
|
||||
+ return i & 3;
|
||||
+ }
|
||||
+
|
||||
@ -462,7 +462,7 @@ index 9ecefea..09ee088 100644
|
||||
+ return i == 0 || i == 1;
|
||||
+ }
|
||||
+
|
||||
+ protected void d() {
|
||||
+ protected void d__() {
|
||||
+ this.g = 0;
|
||||
+ this.h.clear();
|
||||
+ }
|
||||
|
Loading…
Reference in New Issue
Block a user